Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new resolve-git-conflict operator #1011

Merged
merged 2 commits into from
Dec 24, 2017
Merged

Conversation

t9md
Copy link
Owner

@t9md t9md commented Dec 24, 2017

Introduce new operator command vim-mode-plus:resolve-git-conflict
It replace conflicting section with ours or theirs text, which to pick is determined by at which section cursor is placed.

resolve-conflict-operator

In following text(NOTE: 0:, 1: part represent row number, is NOT actual text)

0:
1: <<<<<<< HEAD
2: ours
3: =======
4: theirs
5: >>>>>>> their-branch
6:

When executed, it replace whole conflicting section(row 1 to row 5) with ours or theirs.

  • Executed at row 0: do nothing
  • Executed at row 1: replace with ours
  • Executed at row 2: replace with ours
  • Executed at row 3: do nothing
  • Executed at row 4: replace with theirs
  • Executed at row 5: replace with theirs
  • Executed at row 6: do nothing

@t9md t9md merged commit 9981d95 into master Dec 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant